Revision: bazaar--devo--1.2--patch-14
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Thu Feb  3 04:40:21 GMT 2005
Standard-date: 2005-02-03 04:40:21 GMT
Modified-files: commands/resolved.c
    libarch/conflict-handling.c libarch/conflict-handling.h
    tests/test-conflicts.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-17
    thelove@canonical.com/bazaar--devo--1.2--patch-14
Summary: Updated conflict handling code to use a rel_table so that undo can use it too
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-17
   (code feature) resolved now uses a rel_table instead

